From: Stéphane Glondu Date: Sun, 12 Oct 2025 10:01:45 +0000 (+0200) Subject: Refresh patches X-Git-Tag: archive/raspbian/5.4.0-1+rpi1^2~17 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=082362c88ec43cde9554f2d69b857c8e9ec348e3;p=ocaml.git Refresh patches --- diff --git a/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch b/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch index fdbb2721..3ee8f3be 100644 --- a/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch +++ b/debian/patches/Check-for-definition-of-AT_SECURE-before-using-it.patch @@ -10,7 +10,7 @@ Forwarded: https://github.com/ocaml/ocaml/pull/8842 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otherlibs/unix/envir_unix.c b/otherlibs/unix/envir_unix.c -index cef6cb0..977db1c 100644 +index 0eaac46..407884b 100644 --- a/otherlibs/unix/envir_unix.c +++ b/otherlibs/unix/envir_unix.c @@ -39,7 +39,7 @@ CAMLprim value caml_unix_environment_unsafe(value unit) diff --git a/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch b/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch index 9dcc8ce7..04b3542b 100644 --- a/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch +++ b/debian/patches/Disable-DT_TEXTREL-warnings-on-Linux-i386.patch @@ -8,10 +8,10 @@ Bug: https://github.com/ocaml/ocaml/issues/9800 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac -index 4d94dc6..af1ea7b 100644 +index e7772b9..ca53ac8 100644 --- a/configure.ac +++ b/configure.ac -@@ -1608,6 +1608,16 @@ AS_CASE([$arch], +@@ -1708,6 +1708,16 @@ AS_CASE([$arch], # Alpine and other musl-based Linux distributions [common_cflags="-no-pie $common_cflags"])]) diff --git a/debian/patches/Enable-native-backend-and-dynlink-on-hurd-amd64.patch b/debian/patches/Enable-native-backend-and-dynlink-on-hurd-amd64.patch deleted file mode 100644 index 6daf5d88..00000000 --- a/debian/patches/Enable-native-backend-and-dynlink-on-hurd-amd64.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Samuel Thibault -Date: Wed, 15 Jan 2025 08:23:51 +0100 -Subject: Enable native backend and dynlink on hurd-amd64 - -Bug-Debian: https://bugs.debian.org/1086600 -Bug-Debian: https://bugs.debian.org/1094334 -Forwarded: https://github.com/ocaml/ocaml/pull/13587 ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index af1ea7b..705ab8a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1369,6 +1369,7 @@ AS_IF([test x"$supports_shared_libraries" = 'xtrue'], - [*-pc-windows], [natdynlink=true], - [[i[3456]86-*-linux*]], [natdynlink=true], - [[i[3456]86-*-gnu*]], [natdynlink=true], -+ [[x86_64-*-gnu*]], [natdynlink=true], - [[x86_64-*-linux*]], [natdynlink=true], - [arm64-*-darwin*], [natdynlink=true], - [aarch64-*-darwin*], [natdynlink=true], -@@ -1490,7 +1491,7 @@ AS_CASE([$host], - [x86_64-*-linux*], - [has_native_backend=yes; arch=amd64; system=linux], - [x86_64-*-gnu*], -- [arch=amd64; system=gnu], -+ [has_native_backend=yes; arch=amd64; system=gnu], - [x86_64-*-dragonfly*], - [arch=amd64; system=dragonfly], - [x86_64-*-solaris*], diff --git a/debian/patches/Mark-tests-that-actually-require-multicore.patch b/debian/patches/Mark-tests-that-actually-require-multicore.patch deleted file mode 100644 index e178499a..00000000 --- a/debian/patches/Mark-tests-that-actually-require-multicore.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: =?utf-8?q?St=C3=A9phane_Glondu?= -Date: Wed, 26 Mar 2025 08:39:51 +0100 -Subject: Mark tests that actually require multicore - -Bug-Debian: https://bugs.debian.org/1101353 -Forwarded: https://github.com/ocaml/ocaml/pull/13906 ---- - ocamltest/builtin_actions.ml | 8 ++++++++ - testsuite/tests/memory-model/forbidden.ml | 1 + - testsuite/tests/memory-model/publish.ml | 1 + - testsuite/tests/parallel/mctest.ml | 1 + - testsuite/tests/parallel/pingpong.ml | 1 + - 5 files changed, 12 insertions(+) - -diff --git a/ocamltest/builtin_actions.ml b/ocamltest/builtin_actions.ml -index 0f06062..c1b783b 100644 ---- a/ocamltest/builtin_actions.ml -+++ b/ocamltest/builtin_actions.ml -@@ -102,6 +102,13 @@ let hasstr = make - "str library available" - "str library not available") - -+let multicore = make -+ ~name:"multicore" -+ ~description:"Pass if running on multicore" -+ (Actions_helpers.pass_or_skip (Domain.recommended_domain_count () >= 2) -+ "running on multicore" -+ "not running on multicore") -+ - let windows_OS = "Windows_NT" - - let get_OS () = Sys.safe_getenv "OS" -@@ -367,6 +374,7 @@ let _ = - hasunix; - hassysthreads; - hasstr; -+ multicore; - libunix; - libwin32unix; - windows; -diff --git a/testsuite/tests/memory-model/forbidden.ml b/testsuite/tests/memory-model/forbidden.ml -index 676904c..daf65e5 100644 ---- a/testsuite/tests/memory-model/forbidden.ml -+++ b/testsuite/tests/memory-model/forbidden.ml -@@ -1,5 +1,6 @@ - (* TEST - modules = "opt.ml barrier.ml hist.ml shared.ml run.ml outcome.ml"; -+ multicore; - not-bsd; - no-tsan; (* tsan detects the intentional data races and fails *) - { -diff --git a/testsuite/tests/memory-model/publish.ml b/testsuite/tests/memory-model/publish.ml -index a857c6c..cd000ef 100644 ---- a/testsuite/tests/memory-model/publish.ml -+++ b/testsuite/tests/memory-model/publish.ml -@@ -1,5 +1,6 @@ - (* TEST - modules = "opt.ml barrier.ml hist.ml shared.ml run.ml outcome.ml"; -+ multicore; - no-tsan; (* tsan detects data races and fails *) - not-bsd; - { -diff --git a/testsuite/tests/parallel/mctest.ml b/testsuite/tests/parallel/mctest.ml -index ea339e3..8e2c51f 100644 ---- a/testsuite/tests/parallel/mctest.ml -+++ b/testsuite/tests/parallel/mctest.ml -@@ -1,5 +1,6 @@ - (* TEST - include unix; -+ multicore; - hasunix; - { - bytecode; -diff --git a/testsuite/tests/parallel/pingpong.ml b/testsuite/tests/parallel/pingpong.ml -index eb43734..2508df5 100644 ---- a/testsuite/tests/parallel/pingpong.ml -+++ b/testsuite/tests/parallel/pingpong.ml -@@ -1,4 +1,5 @@ - (* TEST -+ multicore; - no-tsan; (* TSan detects the intentional data race *) - { - bytecode; diff --git a/debian/patches/Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/Put-manpages-in-section-3o-instead-of-3.patch index e7475409..8ba6d02b 100644 --- a/debian/patches/Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/Put-manpages-in-section-3o-instead-of-3.patch @@ -7,7 +7,7 @@ Subject: Put manpages in section 3o instead of 3 1 file changed, 1 insertion(+) diff --git a/api_docgen/ocamldoc/Makefile b/api_docgen/ocamldoc/Makefile -index 5b1f894..71f5a70 100644 +index 058f88c..832cae7 100644 --- a/api_docgen/ocamldoc/Makefile +++ b/api_docgen/ocamldoc/Makefile @@ -61,6 +61,7 @@ build/libref/%.odoc: build/%.mld | build/libref diff --git a/debian/patches/Trigger-output-complete-exe-on-custom-with-an-enviro.patch b/debian/patches/Trigger-output-complete-exe-on-custom-with-an-enviro.patch index 63cbb3b6..807b92d5 100644 --- a/debian/patches/Trigger-output-complete-exe-on-custom-with-an-enviro.patch +++ b/debian/patches/Trigger-output-complete-exe-on-custom-with-an-enviro.patch @@ -7,10 +7,10 @@ Subject: Trigger -output-complete-exe on -custom with an environment variable 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/driver/main_args.ml b/driver/main_args.ml -index ea07d15..7972427 100644 +index 393f9fe..b5d56ba 100644 --- a/driver/main_args.ml +++ b/driver/main_args.ml -@@ -1920,7 +1920,6 @@ third-party libraries such as Lwt, but with a different API." +@@ -1965,7 +1965,6 @@ third-party libraries such as Lwt, but with a different API." include Core include Compiler let _compat_32 = set bytecode_compatible_32 @@ -18,7 +18,7 @@ index ea07d15..7972427 100644 let _dcamlprimc = set keep_camlprimc_file let _dinstr = set dump_instr let _dllib s = Compenv.defer (ProcessDLLs (Misc.rev_split_words s)) -@@ -1939,6 +1938,15 @@ third-party libraries such as Lwt, but with a different API." +@@ -1984,6 +1983,15 @@ third-party libraries such as Lwt, but with a different API." let _use_runtime s = use_runtime := s let _v () = Compenv.print_version_and_library "compiler" let _vmthread () = Compenv.fatal vmthread_removed_message diff --git a/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch b/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch index 510eb3ea..620b9b49 100644 --- a/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch +++ b/debian/patches/Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch @@ -16,10 +16,10 @@ Last-Update: <2021-12-21> 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index 64e6d7e..4d94dc6 100644 +index 0535f40..e7772b9 100644 --- a/configure.ac +++ b/configure.ac -@@ -1353,6 +1353,10 @@ AS_CASE([$host], +@@ -1450,6 +1450,10 @@ AS_CASE([$target], [oc_ldflags="$oc_ldflags -Wl,-z,nobtcfi" natdynlinkopts="$natdynlinkopts -Wl,-z,nobtcfi"]) diff --git a/debian/patches/series b/debian/patches/series index 2f614cca..9e6cce73 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,3 @@ Do-not-error-on-warnings-in-autoconf.patch Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch Check-for-definition-of-AT_SECURE-before-using-it.patch Disable-DT_TEXTREL-warnings-on-Linux-i386.patch -Enable-native-backend-and-dynlink-on-hurd-amd64.patch -Mark-tests-that-actually-require-multicore.patch